fix(vscode): track activation disposables#28386
Conversation
|
📊 PR Size: size/M
|
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses a bug in the VS Code extension activation logic where multiple disposables were being incorrectly grouped using comma expressions. This prevented some resources from being properly tracked and disposed of upon extension deactivation. The changes ensure that all command registrations and workspace event listeners are correctly pushed to the extension context subscriptions. Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request cleans up redundant parentheses in subscription registrations within extension.ts and adds a unit test in extension.test.ts to verify that activation disposables are correctly tracked for cleanup. However, the test suite calls activate(context) across multiple tests without invoking deactivate() afterwards, which leaves Express servers running in the background. It is recommended to import and call deactivate() in an afterEach block to prevent resource leaks and potential test flakiness.
| it('tracks all activation disposables for cleanup', async () => { | ||
| await activate(context); | ||
|
|
There was a problem hiding this comment.
The test suite calls activate(context) in multiple tests, which starts an Express server on a random port each time. However, deactivate() is never called in afterEach or anywhere in the tests, causing these servers to remain running in the background. This leads to resource leaks (ports, memory, file descriptors) and potential test flakiness. Please import deactivate from ./extension.js and call it in afterEach to ensure proper cleanup of the IDE server.
Summary
Fixes #27790.
The VS Code companion activation path was wrapping two pairs of registration calls in parentheses inside
context.subscriptions.push(...). In JavaScript, those become comma expressions, so both registrations run but only the last Disposable from each pair is tracked.This PR removes the comma expressions so these activation Disposables are all retained for cleanup:
gemini.diff.acceptgemini.diff.cancelonDidChangeWorkspaceFoldersonDidGrantWorkspaceTrustIt also updates the extension activation test mock to return tagged Disposables and adds a regression assertion for the affected registrations.
Validation
npm run build -w @google/gemini-cli-corenpm test -w gemini-cli-vscode-ide-companionnpm run check-types -w gemini-cli-vscode-ide-companionnpm run lint -w gemini-cli-vscode-ide-companionNote:
npm installcompleted locally with engine warnings because this machine is on Node20.15.0; the repo recommends Node~20.19.0for development.